From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 14 Aug 2025 07:54:52 +0000 (-0400)
Subject: * admin/admin.el (set-version): Fix handling of official releases.
X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^2~2^2~24^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=ebeca61755e61feed530179dd538b4f0f08862bc;p=emacs.git

* admin/admin.el (set-version): Fix handling of official releases.
---

diff --git a/admin/admin.el b/admin/admin.el
index 0f02ac8d9b1..66c83225aef 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -128,8 +128,13 @@ Root must be the root of an Emacs source tree."
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "java/AndroidManifest.xml.in"
                        (apply #'format "%02d%02d%02d000"
-                              (mapcar #'string-to-number
-                                      (split-string version "\\.")))
+                              (let ((ver-list
+                                     (mapcar #'string-to-number
+                                             (split-string version "\\."))))
+                                ;; Official releases are XX.YY, not XX.YY.ZZ
+                                (if (= 2 (length ver-list))
+                                    (setq ver-list (append ver-list '(0))))
+                                ver-list))
                        admin-android-version-code-regexp)
   (set-version-in-file root "nt/README.W32" version
 		       (rx (and "version" (1+ space)